Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / domain / Client.java

diff --git a/ruralHouses client/src/domain/Client.java b/ruralHouses client/src/domain/Client.java
new file mode 100644 (file)
index 0000000..4dd9eb2
--- /dev/null
+++ b/ruralHouses client/src/domain/Client.java
@@ -0,0 +1,40 @@
+package domain;
+
+public class Client {
+
+       private String name;
+       private String mailAccount;
+       private String telephone;
+
+       public Client(String name, String mailAccount, String telephone) {
+               super();
+               this.name = name;
+               this.mailAccount = mailAccount;
+               this.telephone = telephone;
+       }
+
+       public String getName() {
+               return name;
+       }
+
+       public void setName(String name) {
+               this.name = name;
+       }
+
+       public String getMailAccount() {
+               return mailAccount;
+       }
+
+       public void setMailAccount(String mailAccount) {
+               this.mailAccount = mailAccount;
+       }
+
+       public String getTelephone() {
+               return telephone;
+       }
+
+       public void setTelephone(String telephone) {
+               this.telephone = telephone;
+       }
+
+}